bitkeeper revision 1.1159.258.122 (4284bb88TtN4Lsub-uWEo-2VRJlDPg)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 13 May 2005 14:36:56 +0000 (14:36 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Fri, 13 May 2005 14:36:56 +0000 (14:36 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk-clean


Trivial merge